Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Apr 2010 21:55:36 +0000 (21:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Apr 2010 21:55:36 +0000 (21:55 +0000)
commit08b6fb7b2b5d05af1248b4b33d629397331ccd62
treead7f95a94989567f0e04c26b89380fdc3e7333a1
parente5742610f224d80a50e68e1f077867c15011be71
parenta2bee517a0bbcd3a4bcdb611c9b5fab50b5df93f
Merge from mainline.